Update readme
Cleanup gem and add mixins back as optional include.