updating the changelog
Add a 'favicon' setting
Merge pull request #127 from raphink/dev/favicon

Add a 'favicon' setting
Merge branch 'master' of github.com:puppetlabs/showoff