Org agenda files, def browser to google-chrome (todo)
debian init
First Ediff Merge branch 'master' of github.com:jasalt/konffit

Conflicts:
	emacs/prelude-personal/orgmode.el
Cleanup