Diff the devpull

Rock the casbah, lock the taskbar