Chnange zen coding leader key to <C-k>

Triple press comma to expand HTML tag abbreviation is weird
Merge remote-tracking branch 'origin/master'

Conflicts:
	vim/vimrc.symlink