Don't sort scala imports during scalariform
Merge branch 'master' into macosx