Order matters for little ol pip
Merge branch 'master' into setup.py

* master:
  Order matters for little ol pip

Conflicts:
	requirements.txt