Revert "Revert "Update build tools thanks to SaberMod""

This reverts commit 07c12a306f83fa8b5d82ac6f7683fbdbb641f6bd.
Revert "Revert "Derp in last commit""

This reverts commit a6c4131c973bdeea18479d4d9dd352c36ba34f73.
Lets see if its build