MAP-206: Separate directives and services into separate file
Cleanup controllers.js
Merge branch 'master' of https://github.com/WestCoastInformatics/OTF-Mapping-Service