Update dependencies

Update dependencies for Scala 2.10.  Everything compiled cleanly, just changes to build.  Not sure what to do with the sbt-package-dist plugin, so I commented it out.