Added Project Explorer and Sane Term
Merge branch 'master' of https://github.com/oppenlander/dotfiles

Conflicts:
	emacs.d/emacs-init.org