Mapping semicolon to colon in .vimrc
Merge branch 'patch-2' of git://github.com/bdenne2/dotfiles into bdenne2-patch-2

Conflicts:
	.vimrc
fixing a typo
Merge branch 'bdenne2-patch-2'