Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Merge branch 'master' of https://github.com/cjbarrows/RampantUnicorn"""""""""""""""

This reverts commit 6cb0ec3f87ac20ed226b50f64d0a588a85fd12c5.
Merge branch 'master' of https://github.com/cjbarrows/RampantUnicorn