bundler stuff
Merge pull request #6 from dimtruck/bundler

bundler stuff