-Added option for turning off clustering. #526
-Made maps properly save location.
Merge pull request #528 from mmcguinn/scratch

-Added option for turning off clustering. #526