Start using rbenv and bundler
Fix conflicts with origin and add Guardfile