Merge pull request #3 from tlevine/master

paramatrize joining and daemonness
pep8 and docstring
up the version