Added cursor shape change to gnome-terminal
Merge branch 'master' of github.com:NonWonderDog/.vim

Conflicts:
	vimrc