Updating
Merge branch 'master' of https://github.com/shaabhishek/dotfiles

merging branch
Merge branch 'master' of https://github.com/shaabhishek/dotfiles

Conflicts:
	vimrc