GO AWAY SILLY .SUO FILE STOP ANNOYING ME - Removed useless .suo file from the repository and ensured the ignore list is up to date.
Merge issues
Cleaning up more useless crap left over from builds