Favicon merge

Merging @jasisk favicon changes into master. Please review closely that this merge is correct.

EDIT: I _think_ this covers the divergence between the 2 branches (v1.0.x and master), but would like extra eyes on this to make sure.