merged
Merge branch 'cody'
Merge branch 'master' of heroku.com:myballs
reminder and update mailers