link setting
ctags setting
Merge branch 'master' of https://github.com/cam-xetal/dot_files

Conflicts:
	conf.d/vim-latex.vim