A pull request to build on the one for Favicon

This includes all of the commits from pull request #25, implements all of the comments I made on the request, and completes the favicon test.