Merge branch 'travis-ci'

Conflicts:
	projects/ninux/ninux/settings.example.py
	requirements.txt