Quotes and post formats.
Merge branch 'master' of git://github.com/mikelietz/twentythirteen
Merge branch 'master' of git://github.com/mikelietz/twentythirteen
Merge remote branch 'upstream/master'
Entry template renames for formats.  showeditlink $post property.
Merge remote branch 'upstream/master'