noswapfile
Merge branch 'master' of https://github.com/S010/misc

Conflicts:
	dotfiles/vimrc.local