Upgrade to scala 2.11

This required reworking how dispatchers work
because of Implicit null conversion complaints