Use relative path, minibuffer history retention
Merge branch 'master' of git://github.com/vmiheer/dotemacs

Conflicts:
	miheer94f58f020-guiconfig.el