changes to make deft work; use .org as deft extension
Merge branch 'master' of https://github.com/rsbowman/.emacs

Conflicts:
	init-deft.el
	init.el