Updated init.org
Merge branch 'master' of https://github.com/ragesalmon/dotfiles

Conflicts:
	emacs/init.org