added origami-templates to ignore list
removed modernizr from demo requirements
Merge branch 'master' of https://github.com/Financial-Times/o-ft-typography

Conflicts:
	Gruntfile.js
bug fixes
 - changed link-text-hover to link-hover-text
 - added !optional flag to @extend call
Merge pull request #3 from Financial-Times/bug-fixes

Bug fixes