just some minor things
Merge branch 'master' of github.com:srinchiera/dotfiles

Conflicts:
	.gitignore
	.netrwhist
	custom/mappings.vim