Work in progress.
Merge branch 'master' of github.com:fionawood/commandmaps