Modified env for travis
Added travis badge
Merge branch 'master' into ci-enumerators

Pulling in travis stuff