Merge remote-tracking branch 'origin/master'
remove sublime text 2 alias