fixed stuff
Merge branch 'dev' into config

Conflicts:
	bin/pwview
change to setuptools, add egg and tarball
Merge branch 'setup' into dev
Merge branch 'dev'