Building with MSVC 2013

Most common issue was removing template types from std::make_pair
http://stackoverflow.com/questions/9641960/c11-make-pair-with-specified-template-parameters-doesnt-compile