2.2.x scala 2.11.2

-Fixed DiagrammedAssertionsMacro when built with latest Scala 2.11.2.
-Updated ScalaTest build file and travis build to use the latest Scala 2.11.2.

These changes should be cherry-pick into master.