Include all the requirements in the dev-requirements, even those which will be installed by `pip install .`
Be more and more explicit about how to do things correctly
Do this another way
Merge pull request #236 from alex/safer-docs

Be more and more explicit about how to do things correctly
Merge pull request #235 from alex/include-all-requiremenst

Include all the requirements in the dev-requirements, even those which w...
Merge branch 'master' into rtd-theme

Conflicts:
	dev-requirements.txt