Updated dependencies

Also included a hack. We need to move into application factory style
code.