Misc cleanup
Preparation for a scala 2.11 maven profile
Update master example
Require Executor instead of ExecutionContext
Shared thread pool for master config
Re-order master config args