Updated build for cross building to 2.10/2.11
Don't need semi colons or return in scala
Maps can use partial functions directly
Prefer val to var