Merge develop into master

 - Update support for `{% img %}` tags across Pages, as well as Posts
 - Update (and add instructions) for working with post-2014-07-21 versions of Octopress 2.0