vimrc:colors for cursor and current column
small changes
Merge branch 'master' of github.com:amit666/bashrc

Conflicts:
	.vimrc
queput
diary