Merge pull request #366 from pleary/master

Merging windshaft into master
Merge pull request #367 from pleary/master

Fixed identotron; Added about this map link to observations/map; Improve...