back to arch
Merge branch 'master' of http://github.com/tungd/dotfiles

Conflicts:
	emacs/init.el
start new awesome theme