Added formatting hint to python-mode to circumvent display bug
Disabled auto opening of org files
Merge branch 'master' of https://github.com/pragtich/dot-emacs

Conflicts:
	emacs.el
	emacs.org