Update omz
Update OMZ + sublime settings
Merge branch 'master' into work