scala: Bump to 2.11.0, bump 2.10 to 2.10.4

- Make Scala default to 2.11.0 now
- Move the previous 2.10 version into its own file
- Update the 2.10 version to latest (2.10.4).