Merge pull request #40 from wardi/master

geomap fix from denis and related changes
add try_another_search block, fix search.html <div> nesting
add an id to dataset form to help with functional testing