Updated to include VS2012 project generation