Merge reformatting changes from master and make sure my integration code still works

[azipp]

Probs gonna have to deal with a lot of merge conflicts/path changes lmaoo