Update dependencies, minor SBT cleanup

Some trivial changes.