fix height, remove extra stuff
Merge branch 'master' of https://github.com/motherjones/brackets