First pass adding travis webhook
Merge remote-tracking branch 'origin/master'

Conflicts:
	config.py