Updated a bunch of stuff
Merging. I can't believe I was stupid enough to forget to pull first before doing a huge update