This has been an absolute pain, let's take a break...
Merge branch 'master' of github.com:deidora/hack_tools