Merge pull request #344 from lawinslow/master

Don't forget to update the main.js
Merge pull request #345 from lawinslow/master

Added OSM attribution to address #343
Update for this week