Simplify docs
Merge branch 'master' of github.com:fritzo/puddle

Conflicts:
	package.json