git: define meld as differ
vim: add tagbar plugin
vim: YCM setup to use ctags
vim: show current line
vim: add auto-format plugin
Merge branch 'master' of https://github.com/AntoineD/dotfiles

Conflicts:
	.vimrc