Optimized Semantic Grid Mixins

Removed some duplicate code by making the hybrid mixin include  the
column mixin. Also moved the columnconfig extend call outside the
conditionals.