Removed git+ssh silliness from package.json
Merge remote-tracking branch 'origin/master'