Add serverVars.staticRoot, minor cleanup to common.js
Fix static links, make html pretty
Merge branch 'staging' into topic/fix-static-links

Conflicts:
	python/ecep/portal/templates/base-search.html
	python/ecep/portal/templates/base.html
Add html5shiv back (not sure where it went)
Merge pull request #302 from bhuber/topic/fix-static-links

Topic/fix static links
Fix html5shiv url
Use ternary operator to fix geolocation marker on browse back
Merge pull request #304 from notthatbreezy/topic/fix-geolocation-marker-on-back

Topic/fix geolocation marker on back
Merge pull request #305 from bhuber/topic/ie-fixes

Topic/ie fixes
js cleanup, refactor getUrl, fix search btn
Fix phantom page in history
Merge pull request #306 from bhuber/topic/js-cleanup

Topic/js cleanup
Use if statement to only try and highlight if div selected

Problem here was that a function was trying to be called on a div,
but we are only selecting a div if we are clicking on a location.
This if statement then only tries to apply the highlight class
and scroll into view if a div is selected (e.g. we are looking at
locations)
Merge pull request #307 from notthatbreezy/topic/fix-scrollintoview-error

fix scrollintoview error