Merge branch 'master' into templateallthemarkup
authorJason Skomorowski <jason@indexdata.com>
Mon, 9 Jun 2014 19:26:54 +0000 (15:26 -0400)
committerJason Skomorowski <jason@indexdata.com>
Mon, 9 Jun 2014 19:26:54 +0000 (15:26 -0400)

Trivial merge