cleanup
team page fixes
update team entries
cleanup teams list
Merge branch 'teams'

Conflicts:
	views/index/rules.jade
Merge branch 'master' of github.com:nko4/website