Remove npm package from Ubuntu setup instructions.

npm has since been included in nodejs [for quite some time](http://blog.nodejs.org/2011/11/25/node-v0-6-3/).
Add make package to Ubuntu setup instructions.

(Was missing from a minimal Ubuntu system.)
Merge pull request #3910 from djmaze/patch-1

Update Ubuntu setup instructions