Modded font inclusion as it's messing with rails
Merge branch 'master' of https://github.com/Trustner/trustner_ui_toolkit

Conflicts:
	less/trustner.less
	styleguide/stylesheet.css
	styleguide/stylesheet.css.map