pep-8
adding missing settings
delete unused stuff
templates updated
Merge branch 'master' of https://github.com/cwilhelm/django-teams

Conflicts:
	teams/templates/teams/squad_detail.html
	teams/templates/teams/team_detail.html