Merge branch 'beta'
Merge branch 'beta'
Merge remote-tracking branch 'remotes/origin/beta'
npm is now included in nodejs package. Ubuntu 12.x didn't care but Ubuntu 13 does.
Merge branch 'master' into beta