consolidated Matt's work in timer.rst and migrated it into resource_exchange.rst.  Added more terms to glossary.