Adding everything back in again for the sake of CSS compiling
Cleaning up files
Merge branch 'master' into development
Updated Typekit font settings