Twitter Integration
Merge branch 'master' of https://github.com/joekumar/watersafe

Conflicts:
	watersafe/urls.py