Code fixes, test repair/addition, config additions.

Implemented some fixes to the code for some partially removed items.  Added some tests, and fixed pre-existing tests.  Also added some items to config to make admin pages, and some other area, a little more dynamic.

There is some ZendCon related marketing info added to marketing and home templates. Sorry. Otherwise completely generic.