New lintdiff alias, thanks Ned for the tip
Fixed merge alias
Update GoSublime