Remove some cruft, branch
Fix frame resizing under tiling window managers
Merge branch 'master' into Entities