Remove rake dep
lock
Merge branch 'master' into vagrant

Conflicts:
	Gemfile