Updated to Scala 2.11.2
Remove deprecation
map and flatMap