Revert unintentional change to scalamock repository.
Misc version updates.
Merge pull request #43 from paulp/scalamock-fix

Fix scalamock dependency + version updates.
Merge remote-tracking branch 'bridgewater/master'

This brings in changes to the location of the ScalaMock
dependency, which are necessary for the project to function

Conflicts:
	project/build.scala