Fix awesome config for 14.04
Merge branch 'master' of github.com:wuurrd/dotfiles

Conflicts:
	.emacs.d/old_el_get/el-get
	awesome/rc.lua