whole load of changes
Merge branch 'master' of https://github.com/Zaidean/dotfiles into MECH1342

Conflicts:
	awesome/rc.lua