Removed stuff not required.
Updated to SBT 0.12.4
Updated some randomly failing specs.