First commit from merge

First commit coming from version 10 on SVN. Added a .gitignore file to
keep out the unneccesary Visual Studio project files.