Bugfix42

Lots of fixes here, to frame helpers on OS X and some weird context issues in reapply!

Tested on 10.10, so if you're on 10.9 please run the specs there for me.