fixed awesome clock format
fixed bad whitespace regex for python
Merge branch 'master' into gduserv