Merge branch 'master' into python3

Conflicts:
	setup.py

diff --combined setup.py
index 06c6df7,9fd505b..eb07e39
--- 1/setup.py
--- 2/setup.py
+++ b/setup.py
@@@ -1,13 -1,13 +1,13 @@@
 -#!/usr/bin/python
 +#!/usr/bin/python3
  
  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",
-       # url = "http://www.dolda2000.com/~fredrik/pdm/",
+       url = "http://www.dolda2000.com/~fredrik/pdm/",
        packages = ["pdm"],
        scripts = ["pdm-repl"],
        license = "GPL-3")