Updated to remove mixins and use utils
Merge pull request #4 from topcoat/update

Updated to remove mixins and use utils