Qtile config update
Removed dead code
Merge branch 'master' of github.com:jpic/dotfiles

Conflicts:
	.gitmodules
	bashrc