Revert "Revert "Merge branch 'CMS' of https://github.com/jjahr/designemcee.com into CMS""

This reverts commit e24cc36211970359ddcb7acc84288680d4b5f4cf.
A TON of changes