better colour contrast as per http://snook.ca/technical/colour_contrast/colour.html
Merge branch 'develop'