Added midje-mode
Update scala mode
Merge remote-tracking branch 'origin/master'