Added first pass at shortcuts
Merge branch 'master' of https://github.com/scottstanfield/compsci