remove vim-capslock since it doesn't work pre-7.3
comment out number substitution, add fugitive to lightline
Merge branch 'master' of github.com:thechunk/dotfiles

Conflicts:
	.vimrc
fix missing endif