move map to top of townland detail page, move OSM links to bottom
Merge remote-tracking branch 'upstream/master'