Add both VS2012 and VS2013 as diff tools, ditch rerere