Correctly switch between commandmap and ribbons. Also show progress.
Merge branch 'master' of github.com:fionawood/commandmaps

Conflicts:
	js/questions.js