Use travi-ci's new docker infrastructure + caching
Merge pull request #664 from dsander/travis-docker

Use travi-ci's new docker infrastructure + caching
Do not try to monkey patch the mysql adapter on heroku
Merge pull request #668 from dsander/fix-heroku-deployment

Do not try to monkey patch the mysql adapter on heroku