Adding some of John MacFarlane's evil-org
customizations

[ticket: 2]