Merge branch 'sh-itty-syntax'

Frankly, vim's sh/bash syntax highlighting just sucks.