Build update and code cleanup
SBT - update to 0.13.0, Scala 2.10.3 and Spec2 2.2.3
Refactor  and cleanup code formatting, fix typos