Update bower.json
Update CHANGELOG.md
Colour names and values are selectable
Merge branch 'master' into gh-pages