Revert "Merge branch 'cleanse_lua' of https://github.com/boxmein/The-Powder-Toy"

This reverts commit 8d2798e17d77fcb4b20232b7b18bd49eb361e570, reversing
changes made to 4de1389f883cc759ee142b08e8e655ea5350c1f6.
Revert "Merge branch 'time' of https://github.com/mniip/The-Powder-Toy into mniip-time"

Will re-merge later
Merge branch 'master' into develop