4 commits

Author	SHA1	Message	Date
Emil Hessman	04d09c34d2	website: merge	2015-04-28 20:36:27 +02:00
Emil Hessman	3d5f3d1d70	website: address minor doc typos	2015-04-28 20:32:04 +02:00
James Phillips	a51be643ee	Cleans up some wording on the Consul vs page.	2015-04-28 11:23:35 -07:00
Armon Dadgar	6c1b75659a	website: Adding vs Consul section	2015-04-20 16:15:53 -07:00