Fixed image. Needs refactor to cache image
Tweaked map scaling & switched back to img lib b/c optimization
Merge remote-tracking branch 'origin/master'