clean up extraneous whitespace
setup and teardown times persist across edits

* use "setup" and "teardown" instead of a mixture of "setup_time",
   "setup", "teardown_time", and "teardown"
* change "setup" to "teardown" in a couple of places that were probably
   copy-pastad from setup section and incompletely updated to teardown
Merge pull request #81 from ozzloy/fix-setup-teardown

Fix setup teardown