Display switching
Merge branch 'master' of github.com:clentfort/dotfiles

Conflicts:
	awesome/rc.lua