Local stuff
Merge branch 'local' into working

Conflicts:
	README.md
	home/.config/bash/rc/console2-start.sh
	home/.config/bash/rc/mintty-start.sh
	home/.config/vim/rc
	home/.gitconfig
	home/console.xml