misc cleanup and jshintifying
highlight selected swatch