bundle update
slight gemfile cleanup
Merge pull request #3 from bensheldon/bundle_update

Bundle update
Merge branch 'master' into rspec

Conflicts:
	Gemfile
	Gemfile.lock