archive fixes
Merge branch 'master' of github.com:davemo/macaw-blog