Update NPM for Travis
Fucking CI lifecycle
Merge remote-tracking branch 'upstream/master'