Fixed tests and media queries

Hooray! I fixed things :) Merge this one please and then everybody should pull down dev and make sure the tests pass 100% before you do anything else! 

TODO: Moar feature tests! (omg it never ends)