v2.0.4
Merge branch 'production' of github.com:strongloop/slnode into production

Regenerated man/ pages, and stripped trailing whitespace.

Conflicts:
	package.json