Merge pull request #10 from zinic/master

	fixes for packaging
Merge branch 'master' of github.com:zinic/portal
cleaning up the setup.py script one last time to make it honestly sane