From: https://github.com/kennethreitz/pystache/commit/200ab9c3731a6f9baf8709c107fae0a5984d6b28
Into: issue_29

Adds "Cheeseshop" to the docstring for setup.py's publish() function.

Conflicts:
	setup.py