Bumping scala to 2.10, and fixing 2 tests that blow up on my machine due to a .gitconfig and P4PORT env variable being set