Merge remote-tracking branch 'origin/dev'
Add some tests for fun and add Gem/Rakefile
Changed my mind about vendoring gems
Change rspec-core to rspec in Gemfile
Merge pull request #129 from brysgo/dev

Add some tests for fun and add Gem/Rakefile
Add travis config
Add circle-ci badge to readme
Remove travis yml in favor of circleci
Merge pull request #140 from brysgo/add-circle-ci-badge

Add circle ci badge
Added empty circle.yml
Merge branch 'dev' of https://github.com/johnku1/betty into orgin/dev
Added info for Circle.yml
Fixed the Gemfile.lock
Another fix for my Gemfile.lock.
Merge pull request #141 from johnku1/dev

Circle.yml file added.
Merge remote-tracking branch 'upstream/dev' into dev