sorts out merge conflict for #343

Fixes magistrate starting loc
Typos
Alien Tweaks, Commented Out Detomatix
Merge pull request #346 from VampyrBytes/master

sorts out merge conflict for #343
Merge pull request #345 from SamCroswell/master

Alien Tweaks, Commented Out Detomatix
Merge pull request #331 from ZomgPonies/master

Patch