Some customization work.
Merge branch 'master' of https://github.com/arusahni/dotfiles

Conflicts:
	vimrc