Re-enable Scala 2.11 build.
Update support to use new macro layout.