Updating setup.py for better packaging - added tox.ini
Fixing some stupid merge conflicts
Merge branch 'master' of github.com:zinic/portal
cleaning up the setup.py script one last time to make it honestly sane
cleanup
Merge pull request #12 from zinic/master

fix packaging once and for all