don't re-render the map
fix renders
gitignore stuff
Merge branch 'master' into test
fix markers