conditional for base-em-font-size
updated base-em-font-size conditional, added comments
simplified the fix, not conditional on typesetted anymore
Merge pull request #18 from ianrose/gh-16-compounding-base-em-font-size

Compounding base em font size with Typesetted
Merge branch 'master' into gh-14-debug-vertical-alignment

Conflicts:
	_typesettings.scss