Merge branch 'master' of github.com:bananagranola/dotfiles

Conflicts:
	.config/openbox/rc.xml
	.xscreensaver
Merge branch 'master' of github.com:bananagranola/dotfiles