Add new variables, changes in db format, and more
Merge branch 'master' of https://github.com/acatwang/internet2