.
Merge branch 'master' of github.com:amit666/bashrc

Conflicts:
	.vimrc
Added several vimrc functions
.