cartodb js and other changes
Add some controller tests
Merge branch 'master' of github.com:unepwcmc/MacarthurWatersheds