Code formatting and general cleaning.

* Update descriptions of templates
* Fix a couple of references to the FogBugz