Renamed screenLocation to worldLocation to prepare for the eventual larger map size.
Merge origin/master into mike
Merge pull request #14 from mfrancis95/mike

Minor changes