Small local changes on home laptop
Merge branch 'master' of https://github.com/qeny/dotfiles

Conflicts:
	bashrc
	xbindkeysrc