Merge pull request #167 from mholt/master

Retina-friendly favicon and touch icons