Merge cleanup

Adjusted the output and changed the doghouse link from an always on
thing to an option set at the top of the index.php file.