Moved some styles that don't need to be in mixin.
Merge master
Merge pull request #7 from guardian/mixin-cleanup

Small clean up in mixins - again.