Merge pull request #175 from markrickert/map-enhancements

Map enhancements
Merge pull request #178 from markrickert/nstextalignment

UITextAlignment is deprecated in favor of NSTextAlignment
use weakref to prevent leak

I noticed that formotion was leaking for me (2.17) and I traced it down to this
Merge pull request #179 from iwarshak/patch-1

use weakref to prevent leak
Merge branch 'refs/heads/master' into texties

* refs/heads/master:
  use weakref to prevent leak