Test that a map returns Options
Test that you can get the values from an Option using matching
Test the Option factory method
Test usage of 'map' on the Option case class
Test equality of case class instances
Work out how to get the name of an enum from the value
Add Mockito dependency
Get a basic Mockito test working under specs2
Add note about using "was called" or "was notCalled" syntax in Specs.
Use Mockito to verify method which returns Unit
Merge branch 'master' into akka

Conflicts:
	build.sbt