Move most dev reqs to dev-requirements.txt
Merge branch '1.6'
Merge branch 'master' of github.com:fabric/fabric