Made the forced reposition for annotations optional.
Merge branch 'develop' of https://github.com/mousebird/WhirlyGlobe into develop