settles merge conflicts
settles merge conflicts
Merge branch 'master' of heroku.com:fantasy-nuclear-football
removes twitter rake...not sure why it was there in the first place
Merge pull request #36 from tiger-swallowtails-2013/heroku

Heroku