emacs file restructuring. adding org mode
Merge branch 'master' of https://github.com/costrou/dotfiles

Conflicts:
	bash/env