Few minor changes
Apparently, the "subl"-file in /bin gave all those conflicts. Removed this file and set other things back to normal. Works like a charm now. Put the creation of the symlink in .extra.
No logfiles in repo please!
Alias for opening current folder in finder