Merge branch 'origin-master' into origin-awesome-3.5

Conflicts:
	awesomerc.lua
Merge branch 'awesome-3.5' of github.com:saulrh/dotfiles into awesome-3.5
remove the confirmation when emacs installs packages at startup