Theorems, lemmas, ..., definitions should share a common numbering counter.
Fix more mistakes
Merge branch 'timjb-master'; commit '01121e9'
Reset theorem numbering
Fixed one more mistake