Merge remote branch 'origin' into nwallen-master

Conflicts:
	traveler/static/js/travelermap.js
	traveler/static/themes/default/mapstyles.js
Merge branch 'master' of https://github.com/nwallen/OpenLocast-Web into nwallen-master

Conflicts:
	traveler/templates/root.django.html
Adds MISTI-specific type and spacing
Adjusts positioning and style of map controls
Improves styling of map place control
Merge branch 'master' into misti
Position place selector and hides cluster paths
Adds cast title to map marker on hover
Merge branch 'master' into misti