Merge pull request #3 from jordandukart/7.x

Merge DGI upstream into Berkeley.
Add Berkeley specific things.