Cleanups, upgrade to latest akka 2.2 RC

already running in production...
/cc @bantonsson, @jsuereth