scala 2.11.3, final case classes, small cleanups
back to scala 2.11.2, strict conflict manager, macro cleanups