Misc cleanup
Preparation for a scala 2.11 maven profile
Update master example