Feature

I think this will merge mybb/feature into my holyphoenix/feature.  I think.  (sorry if I send mybb a pull request instead of giving it to myself)