Upgrade Scala 2.11.4
Upgrade spray-json 1.3.1
minor clean up