Merge current version of node-gyp (adds VS2013 support)