Bug942867

Hey, 

I have rebased my branch and also put the media queries on one line and indented all the properties based on comments i received on irc.