Merge remote-tracking branch 'refs/remotes/origin/theAzack9'
hurp
this was durpy
Merge branch 'refs/heads/Dritory'
Fixed tox
Made bucket tox
Did some cleanup
Made altar more awesome!
Merge remote-tracking branch 'refs/remotes/origin/master' into theAzack9
Cleanup