update bundle
Merge branch 'master' of github.com:akerl/committed

Conflicts:
	Gemfile.lock