Merge branch 'master' of https://github.com/amadanmath/dotfiles
More standard is non-local, I guess.
Merge branch 'master' of https://github.com/amadanmath/dotfiles
Vim: clipboard 'unnamedplus' if possible
Merge branch 'master' of https://github.com/amadanmath/dotfiles

Conflicts:
	home/.vimrc