Revert "Revert "Merge remote-tracking branch 'origin/master'""

This reverts commit 7022a70e502c0a65d37d630d6204574974f0e447.
Cleaned up all merge conflicts

Wow I really need to learn git better