Updated environment vars to test travis build
Merge branch 'development'