fix up specs & clean up whitespace
Merge branch 'master' into color_tweak
less bright, please