Fix #1122 and #1202 -- add support for logos and make bootswatch work again.

This is #1122 and #1202.