add melpa to package archives
Merge branch 'master' of medeltiden.org:private/thomasf/home/emacs
up lib
git-gutter
up lib
face
conf
always save desktop