added python-environment
Merge branch 'master' of https://github.com/s-hahn/.emacs.d