Update my fork to match the current master.

Attempting to pull changes from master branch to my own. (I think I may be accidentally doing the opposite in which case I'll figure out how to delete this later)