Merge branch 'master' into develop
Clarified travis options.
I don't think these are needed for TravisCI anymore.
Merge branch 'develop'