Merge branch 'master' into python3

Conflicts:
	setup.py

diff --cc setup.py
index 06c6df7772acfcba5ca14ffc5ae0e6384fa717ad,9fd505bd2605d34514993084b9d68aec7de707a8..eb07e39c35c459f8749d6255fd5b4c50d24d2919
--- 1/setup.py
--- 2/setup.py
+++ b/setup.py
@@@ -2,8 -2,8 +2,8 @@@
  
  from distutils.core import setup
  
 -setup(name = "pdm",
 +setup(name = "pdm3",
-       version = "0.1",
+       version = "0.2",
        description = "Python daemon management library",
        author = "Fredrik Tolf",
        author_email = "fredrik@dolda2000.com",