Merge pull request #25 from gavinlaking/twerks

Cool stuff.
Bump gem version to 0.0.22.
Started work on better composition.
Move Buffer related models, add tests.