Try using an ico file for the favicon
Merge branch 'favicon'

Again, I didn't make a pull request because the only way to test this is to
push it in.