Always rebase
More additions to sublime confs