6 Commits (607dd019d3f307432d62397ca2735f60d40de3bb)

Author	SHA1	Message	Date
nathan haugo	afbaea5849	Cleanup and aggregates of templates	2016-11-11 13:02:12 -08:00
Chris Goller	d62d34ad0b	Update ids and redis JSON format (extra {)	2016-11-10 16:48:16 -06:00
Will Piers	b4a6feae70	Remove merge conflict code	2016-11-10 14:11:44 -08:00
Will Piers	88e0ecbcab	Fix regex bug	2016-11-10 13:51:03 -08:00
Chris Goller	1f01ab8b1c	Update layouts to use jq format and fix nsq ids	2016-11-10 15:06:13 -06:00
nathan haugo	77ad1a4dfb	Add redis layout	2016-11-10 12:34:41 -08:00