Untracked sublime package-control
added systemd journal alias
removed su alias
fixed merge conflict