Get the correct directory
Merge pull request #1793 from DaNiwa/change_make.ps1

Get the correct maps directory in make.ps1
Revert "Add in hacks for CommuniCon"

This reverts commit 071a5a8fb1a877e751db484ce869ea177b514948.
Merge pull request #1799 from DaNiwa/prep_release

Revert "Add in hacks for CommuniCon"