Tidy up whitespace
Merge pull request #26 from linquize/whitespace

Tidy up whitespace
Merge remote-tracking branch 'remotes/origin/master' into msvc-proj