Gettext filters, good riddance.  @todo Test. Test. Test.
Merge branch '2.0' of https://github.com/justintadlock/hybrid-core into 2.0