Fixed travis tests.
Merge branch 'layout' of https://github.com/agrc/deq-enviro into layout

* 'layout' of https://github.com/agrc/deq-enviro:
  Fixed travis tests.

Conflicts:
	.travis.yml