From: Jason Skomorowski <jason@indexdata.com>
Date: Mon, 18 Aug 2014 13:19:57 +0000 (-0400)
Subject: Merge branch 'master' into templateallthemarkup
X-Git-Tag: 1.0.0~324^2~34
X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=d287f4680ff3ed663ccc5c01a7065713e9c52c84

Merge branch 'master' into templateallthemarkup
---

d287f4680ff3ed663ccc5c01a7065713e9c52c84