Upgrade to 2.11

Also update test case to use ScalaTest Matchers

Signed-off-by: Nathan Brahms <nathan@meraki.com>
Merge branch 'scala-2_11' into release