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

...warnings