Starting setup.py for PyPi index upload.
Merge branch 'master' into michiel
Getting setup running.