changed mixins
refactored the font mixin
Merge pull request #26 from desicochrane/dec-14-replace-things

Dec 14 replace things