Shortcuts

Implement shortcuts mentioned in #55 
I still don't think we should be checking this file into version control, it is generated isn't it?