Fix for #2 plus SBT 0.13 upgrade and deprecation removals.

I'm not that familiar with Machine, and the lack of tests is a concern, so I've started to fix that by adding a test for the area I've touched.
Fix for #2 for 2.9 as well as 2.10.  The Around facilities in specs2 have change too much between 2.9.2 and 2.10, so I've inlined the database set up.
Merge branch 'master' into d6y_sbt13

Conflicts:
	build.sbt
Merge branch 'd6y_sbt13'
Deprecation fix for 2.6