don't need that
cleaner?
Merge branch 'master' of https://github.com/kennethlove/Tango

Conflicts:
	MANIFEST.in