Only run CI on master and production
Merge remote-tracking branch 'origin/master' into travis-ci
Updated requirements for testing ci
Merge branch 'travis-ci'