Sort out dev dependencies
Add LICENSE file
Merge remote-tracking branch 'origin/master'

Conflicts:
	setup.py
Sort out tox and Travis config files