Revert "Unmerging master."

This reverts commit d50bddaa21366667480175cea8c5bc9c46883e8e, reversing
changes made to 0524d846bb09acb3425b03397b600c44241778c0.
Revert "Unmerging master."

This reverts commit 6a8271d6731cfa068d63a0a6cc7eb5815bdd6d35, reversing
changes made to c2de7961f6605ec7ce6162ce4d6bcf162e082884.
Revert "Revert "Unmerging master.""

This reverts commit a0d6b2a8c2816f63dbf8ff8da22ebaf7b9a988e7.
Revert "Revert "Unmerging master.""

This reverts commit 2862fef019eeff39eb479d8e32e56ff01d276c52.
Change spacing of li, and color of teaser headers.