prep for shelling
Merge branch 'master' of https://github.com/motherjones/brackets