fixed bad whitespace regex for python
Merge branch 'master' into laptop