Cleanup base less file, use semantic grid mixins
Merge