Non-trivial readme cleanup
Merge branch 'master' of github.com:seatgeek/sixpack into develop

Conflicts:
	README.md
minor
Merge branch 'develop' of github.com:seatgeek/sixpack into develop

Conflicts:
	sixpack/server.py