Merge pull request #6890 from daverodgman/vs2013

Update paths and VS solution file to VS2013