Merge pull request #132 from nfeliciano/mapZoom

Added map zoom code from Jespers branch
minor ui edits, and removed some files
Merge pull request #134 from nfeliciano/uiTouchups

minor ui edits, and removed some files
merged in master