Colours in config can be specified using the short hex form (#fff)
Merge branch 'master' into heroku
Added Godeps