Changes in vimrc
Merge branch 'master' of https://github.com/aerohit/dotfiles

Conflicts:
	vim/vimrc