Epic commit dump

This is such bad practice.
Merge branch 'master' of https://github.com/skunkfrukt/prismatic-zealotry