Merge cleanup
.gitignore touchup
Giving up on "versionless" Visual Studio files; VS 2012 it is for now