Merge pull request #186 from jasnow/master

Upgraded to Rails 4.1.1; Rebuilt Gemfile.lock file
Upgrade to ruby 2.1.2

Current version (2.1.1) on server was built using this patch https://gist.github.com/orendon/e99a98f5230b9f062143
This release fix the readline issue plus other improvements https://www.ruby-lang.org/en/news/2014/05/09/ruby-2-1-2-is-released/
Update ruby and rails versions on travis script file
Merge pull request #188 from orendon/update-to-ruby-2.1.2

Upgrade to ruby 2.1.2
Add database.sample.yml
Ignore database.yml to allow customize dev env
Add vagrant file from https://github.com/orendon/vagrant-rails
git ignore .vagrant/ folder
Rebuild db/schema.rb
Add vagrant usage to README
Include database.yml on Travis config
Add Fivemar formatter for rspec
Update travis config with fivemat formatter and database.yml
Merge pull request #189 from orendon/add-vagrant

Add vagrant VM