syntastic and ycm
vim plugin+aliases fix
M erge branch 'master' of github.com:posva/dotfiles
Merge branch 'master' into imag

Conflicts:
	vimrc