Merge pull request #1082 from seanpaultaylor/next

Next
Moved the next branch up to now use Visual Studio 2012.