Personal changes
Merge branch 'master' of github.com:pstch/emacs-config

Conflicts:
	.gitignore
	modules/emacsd-python-module.el