Make commit step explicit
Update merge commands
travis fixes + debugging osx
Merge branch 'master' of github.com:DennisOSRM/node-osrm into osx