added emmet and jade plugins
Don't even know
cask alias, vim-rails
Merge branch 'master' of https://github.com/bzf/dotfiles
Added vim-jedi and vim-rust
Merge branch 'master' of https://github.com/bzf/dotfiles

Conflicts:
	.vimrc
Added , as leader in vim