Rename team_users table
Merge branch 'master' of https://github.com/tmacdonald/foos

Conflicts:
	app/views/teams/show.html.erb