Changed a few things around and now uses rake and bundler