Updated npm dependencies and made server.js work with express 4.

Using ~ instead of >= for versions to prevent npm from installing 4.4.1
even though 2.4.6 was used before.

Also, Atom removed some trailing whitespaces...
Merge branch 'amiuhle-dependency-update'