Halfway through windows build being added
Updating .gitignore
Merge remote-tracking branch 'origin/master' into win_edits
Cork will now build in VS2012