Some changes to python setup
Merge branch 'master' into emacs24