Fix nondeterministic sort that broke integration tests (nondeterministically)
Clean up sbt version cut-and-paste in integration tests

This could certainly be improved further (for example
by getting the versions from the build) but at least
with this further improvements will be more localized.
Merge pull request #45 from sbt/wip/havocp-version-cnp

Integration test fixes / cleanups