updated shortcuts
Merge branch 'master' of github.com:joewarren/jeffica