Prepares core classes for FX traits
Merge branch 'master' of github.com:anathema/anathema