Merge branch 'master' into python3

Conflicts:
	setup.py

diff --cc setup.py
index eb07e39c35c459f8749d6255fd5b4c50d24d2919,adc974ece8d3c27efe30eb7673257ea70b5a1daf..96a5d226cb7cccbaa8de1f3308ac62429d4f696f
--- 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.2",
+       version = "0.3",
        description = "Python daemon management library",
        author = "Fredrik Tolf",
        author_email = "fredrik@dolda2000.com",