Removed leftover references to Genericons
Merge branch 'develop' into node-sass