Renamed a couple of methods to work around an app store submission problem.  Apple's method scanner is duuuumb.
Merge branch 'develop' of https://github.com/mousebird/WhirlyGlobe into develop