Trimming the fat in css stuff.
Merge branch 'refs/heads/master' into triathlon