=BG= talk about making wintersmith work together with gh-pages
=BG= end note for static site generation
=BG= modify article template to display tags after content
Merge branch 'feature/experimenting-with-static-site-generation' into develop
Merge branch 'release/20140206'
=BG= fix template bug and update tags
=BG= fix merge conflicts