Added VS2012 Compatibility

Finally got the VS2012 solution to build correctly without affecting the other builds (VS2010 etc)