Re-organises various files after discussion with Todd.
Fixed errors and updated mixins.
Removes mixins that simply prefix stuff. Codekit 2 now required.
Merge remote-tracking branch 'origin/develop'