Update to master.
Merge branch 'master' of https://github.com/emeryberger/Hoard