Hacked in soft tabs to ace editor.
Merge branch 'dev'