Update Gemfile source
Update dependencies
Add Readme
Update versions
Add Ruby 2.1.0 to Gemfile
Resolve merge conflicts
Merge commit 'e05ca2905da9ef8409e7e30c6738082f07e87672'

Conflicts:
	Gemfile
	Gemfile.lock