Merge pull request #12 from cschroed-usgs/master

Watersmart 233
Refactoring controllers.