Change shortcuts that conflict with new Brackets features coming in Sprint 38

Addresses https://github.com/emmetio/brackets-emmet/issues/37