Merged from fork and added VSUnity tools for 2013