removed uneeded helpers
some controller work
Merge branch 'social' of github.com:neotenic/protobowl into social