formatting corrections for travis
Merge branch 'dev_to_core' into dev