MEGA-COMMIT.

Still don't understand that bug. wtf.
Merge branch 'master' of github.com:KevinMcHugh/mustached-nemesis