Merge branch 'master' into jeremyhelms
Adding syntax highlighting for Bash