Install requires six
travis needs to install six, too
Merge branch 'master' into feature/get-travis-passing

Conflicts:
	setup.py