Fix #538, pull out color/style helpers in the process - is this good?
Moved to full module inclusion and not defining methods that then call the module
Move normalize_styles to a StyleNormalizer class
normalizer spec
Merge branch 'master' into move-helpers
fix automatic merge
Merge pull request #591 from shoes/move-helpers

Fix #538, pull out color/style helpers in the process - is this good?