Update history to reflect merge of #1306.
Update history page in the docs to include #1304.
Merge branch 'master' of github.com:mojombo/jekyll

* 'master' of github.com:mojombo/jekyll:
  Add Jekyll Image Tag to the plugins list