Actually adds font feature settings…

Conflicts:
	app/assets/stylesheets/_bourbon.scss