Remove therubyraces (crashes on heroku)
Gemfile update.
Merge branch 'dev'