awesome updates
Merge branch 'master' of github.com:dirvine/dotfiles

Conflicts:
	.config/awesome/rc.lua
	.vimrc