Click. See. Huzzah.
Merge branch 'master' of github.com:wedgiebee/mapStuff into gh-pages