Updated Sublime
Small clean up in bashrc
Reverted to merge instead of rebase per default