Merge remote-tracking branch 'origin/eric'

Conflicts:
    awesomerc.lua
    emacs.d/init.el
    xmodmap.conf
    zshrc