Add instructions to uninstall serv.
Merge branch 'master' into npm-only
Clarify the README a bit.
Merge branch 'master' into npm-only