Update .travis.yml
Merge branch 'rails3'
Merge branch 'master' into heroku