vimrc
Merge branch 'master' of https://github.com/lpenguin/rcfiles

Conflicts:
	.vimrc
.bashrc.inc