Samarion develop

Some code hygiene contributions. If you agree, merge this into your branch and rebase to get rid of the merge commit.
You could probably try @daniel-trinh's fork, we'll probably move to that one for the IDE builds very soon (already on it for 2.12 builds).

https://github.com/mdr/scalariform/issues/114