Merge branch 'master' into 'master'

Include tags and categories at the end of each individual blog post

![Screen Shot 2015-11-23 at 3.40.02 PM](https://gitlab.cwp.govt.nz/uploads/cwp-themes/default/ae40f57179/Screen_Shot_2015-11-23_at_3.40.02_PM.png)

See merge request !94