Added g* g# commands
Merge branch 'master' of github.com:glts/dotfiles

Conflicts:
	vimrc