BUG: Fix a couple minor bugs related to assumptions in the code.
Merge branch 'develop' of https://github.com/WestCoastInformatics/OTF-Mapping-Service into develop