Add vim-rake as submodule
Merge branch 'master' of github.com:jslu/dotfiles

Conflicts:
	.gitmodules