Recorrect travis
Reset south migrations --read

Moved to a new server, which required a new south migration set. TAKE CARE OF THEM
Merge remote-tracking branch 'upstream/master' into events

Conflicts:
	.travis.yml