Minor edits to work on push and pull.
Merge branch 'develop' of https://github.com/WITBEntertainment/HarmonyOfDawn into develop