capture updates to licensing terms and remove unnecessary methods
Merge branch 'master' of https://github.com/nuodb/nuodb-django