3 commits

Author	SHA1	Message	Date
Lance Stout	79b71228c1	Fix some more merge conflicts.	2012-01-18 15:31:45 -08:00
Lance Stout	b345c227b2	More &yet branding	2012-01-05 13:07:44 -05:00
Lance Stout	97378998a5	Break the docs out into their own branch.	2012-01-05 11:31:54 -05:00