Tempo is now BPM not millisecond waits
Merge branch 'fix-options' into gh-pages