Added travis
Updated travis
Updated travis
Updated travis
temp commit for heroku fix
commit to verify travis build
commit to verify travis build
Merge branch 'master' into develop