Update Gemfile
Merge branch 'update-gemfile'

Conflicts:
	Gemfile.lock
Merge pull request #8 from calblueprint/gemfile

Gemfile