Mapping updates and bug fixes

Slosky, Daniel (Contractor) A requested to merge github/fork/dslosky-usgs/master into master Mar 13, 2017