modify .travis.yml for heroku
Merge pull request #103 from i-d-e-a-t/modify-travis-setting

modify .travis.yml for heroku
#92 resolv conflicts