Updating typography
Misc updates
Merge branch '1.x-dev' into gh-pages

Conflicts:
	css/styles.css
getting rid of maps