Merge branch 'scala'
Removed spring mvc from core (sbt bug: https://github.com/sbt/sbt/issues/1465)
Weird state for cukes.
More scala crap that doesn't work...