Clean up vimrc. move stuff to ftplugin
Do not symlink ~/.git to ~/dotfiles/.git
Load the CustomTabularPatterns on VimEnter
vimrc: add indent mappings
Merge remote-tracking branch 'origin/master'

Conflicts:
	.vimrc