Make bin/s a symlink to subl
Merge branch 'master' into fish