Add vim-autoformat
Merge branch 'master' of https://github.com/tillarnold/dotfiles

Conflicts:
	.vimrc