Revert to standard font awesome import
Merge branch 'master' into gh-pages