Remove vim mode, update wacky
Merge remote-tracking branch 'origin/master'

Conflicts:
	[resolved] Gemfile
	[resolved] Gemfile.lock