only build master and release with travis-ci
config entries that are unchanged through config updates are no longer marked as modified by print_config
Merge branch 'master' into develop