Update to run on VS12
Add VS12