Updated Mixins and Gruntfile