Config clean-up.
Merge branch 'master' of https://github.com/mateusz-holenko/dotfiles

Conflicts:
	awesome/rc.lua
	awesome/vicious