Merge remote-tracking branch 'bbatsov/master'
Adds octave-mode.
Merge remote-tracking branch 'bbatsov-prelude/master'
Merge branch 'master' of aisbaa/prelude
Merge branch 'master' of github.com:aisbaa/prelude