Merge branch 'master' into templateallthemarkup
authorJason Skomorowski <jason@indexdata.com>
Tue, 8 Jul 2014 20:23:29 +0000 (16:23 -0400)
committerJason Skomorowski <jason@indexdata.com>
Tue, 8 Jul 2014 20:23:29 +0000 (16:23 -0400)

Trivial merge