Lists each variable in the search results
Display tags if they exists instead of var name
Show long name if available
Hard code long name for known local variables
Fix result container id
Merge in master and fix css conflict
Merge branch 'master' into 161-list-variables-on-search

Conflicts:
	web/apps/archive/archive.js
Fix merge conflicts
Update submodule
Fix layout of search items
Fixes layout, adds source badge to items
revert back to floating divs instead of inline-block li
Past temporal and spacial constraints to ESFG query

Now that we can specify a bound box and date range augment the
ESGF with these constraints.
Merge remote-tracking branch 'origin/161-list-variables-on-search'
Merge remote-tracking branch 'origin/204-esgf-query-constraints'
Updated GeoJS
Merge remote-tracking branch 'origin/update_geojs'
Updated geojs
Merge remote-tracking branch 'origin/update_geojs'
Merge remote-tracking branch 'origin/master' into floodmap

Conflicts:
	web/lib/geojs