+ include package names in setup.py
+ some more setup.py improvements
+ thanks, Ian Young!