Fixed various merge conflicts and whatnot
Merge remote-tracking branch 'origin/master'