Get rid of borders, fix margin collapse thing

![screen shot 2014-12-08 at 9 11 18 pm](https://cloud.githubusercontent.com/assets/556932/5351132/ca5a3d6a-7f1e-11e4-8b66-27a03adfeb29.png)