sorts out merge conflict for #343

Fixes magistrate starting loc
Merge pull request #346 from VampyrBytes/master

sorts out merge conflict for #343