Vs2103 support

Changes I needed to make to get the project building on a fresh VS2013 install