Merge pull request #33 from matysek/develop

django fixes, pkg_resources, file structure reorganization, license info cleanup.
Edit: Simplified docutils, sphinx hooks (no need for hook() function)
Merge pull request #37 from bjones1/develop

Simplified hooks for docutils and sphinx: no need for hook() function.
Merge remote-tracking branch 'upstream/develop' into develop