Fixed problems with settlement/city drawing
"Merge GitHub repo with Jeremy's local repo"

Merge branch 'master' of https://github.com/jjacobskind/settlers