Merge branch 'brennonbrimhall-topic/travisEnviornment'