From: Jason Skomorowski <jason@indexdata.com>
Date: Tue, 4 Nov 2014 17:16:28 +0000 (-0500)
Subject: Merge branch 'master' into prettysimple
X-Git-Tag: 1.0.0~83^2~5
X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=refs%2Fheads%2Fprettysimple;p=mkws-moved-to-github.git

Merge branch 'master' into prettysimple

Conflicts:
	src/templates/facets.handlebars
---

5fce8c968981efbd7fc063faa833f7d8093dd630