Lets test this
Merge branch 'master' into gh-pages
Misc changes to TODO, LeafletOSM CSS
Updated TODO