Adding integration and unit test for Water, fixed small auth-tests error, changed nav on main.jade template. Closes #21
Merge branch 'master' into adding-water-jc