merge current state to master for dan
merge current state to master for dan

andrewljohnson/Deep-Trails,silberman/Deep-OSM,silberman/Deep-OSM,trailbehind/DeepOSM,trailbehind/DeepOSM,trailbehind/DeepOSM,andrewljohnson/Deep-Trails,andrewljohnson/Deep-Trails