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

Conflicts:
	.config/Trolltech.conf
	.xsessionrc