Updated to latest o-colors, so no bower conflicts. Also fixed some sass warnings
Merge pull request #19 from Financial-Times/color-version-update

Updated to latest o-colors, so no bower conflicts. Also fixed some sass ...