Alpha and Omega

The alpha and omega classes were not working because they were defined before the the .grid_x section.  The grid mixin would then overwrite their margin changes.  I have moved them after.