Merging changes into develop
Limit travis to develop and working
Can link to state envs as well as dev repos
Merged from develop