.gitconfig: configure for activeeon
Add dual monitor xorg.conf for britany
Merge branch 'master' into ae
Merge branch 'master' into ae
Merge branch 'master' of github.com:mebubo/dotfiles into ae
Merge branch 'master' into ae
Add grub configuration for britany
emacs: update settings in my-comm.el
Merge branch 'master' into ae
Merge branch 'master' into ae
Merge branch 'master' into ae
Merge branch 'master' into ae
Merge master
Merge branch 'master' into ae

Conflicts:
	.gitconfig
Merge remote-tracking branch 'origin/master' into ae
.emacs: wrap mu4e stuff with with-library
.environment: snapshot
awesome: add spaces to tag names in dual-screen
awesome: don't honor size hints
awesome: use x-terminal-emulator