Get it running in VS 2012

Lots of line ending issues here that I didn't bother with :trollface: