pep8 and whitespace fixes
Using r'' for better regex string readability
Making file owner and group regex a little more lax

Adding '-' to the group of allowed characters on top of \w