requirements.txt: use dependencies specified in setup.py
fix travis
try harder to fix travis
try harderer to fix travis
try hardererer to fix travis
Merge branch 'master' into dist

Conflicts:
	requirements.txt
	setup.py
use setuptools entrypoints rather than scripts
Merge pull request #16 from mitmproxy/dist

improve distribution