Merge pull request #327 from erickt/develop

bump dependencies