Seems I can't partially commit after a merge. Oh well. MahTweets.Core/Filters/StreamModel.cs - I'm not sure why I have this, but it seems logical and has been working for a while MahTweets/App.xaml.cs - Rather let the debugger catch my unhandled exceptions in debug mode */AssemblyInfo.cs - if these are generated, shouldn't they just be left out of source control MahTweets/Plugins/*.dll - again, why in source control?