GIO page edits
Merge branch 'master' of https://github.com/TNRIS/site-mockup

Conflicts:
	templates/_form_macros.html
drop bootstrap affix stuff (for now)
rework navbar to fix a few things
add make about/contact links in nav bar white
CSS Fixes, Filling in Data Catalog
Merge branch 'chrisCSS' into css-fixes

Conflicts:
	content/data-catalog.csv
	content/markdown/maps-and-data/online-mapping-services.md
	content/markdown/maps-and-data/web-mapping-services.md
	content/markdown/mapsanddata/web-mapping-services.md
	scss/tnris.scss
	templates/maps-and-data.html
	templates/partials/footer.html
	templates/partials/navbar.html