Swatch fix

Fixes https://github.com/mapbox/tm2/issues/274 / fixes https://github.com/mapbox/tm2/issues/273 properly / moves swatches to front of color: 
![screen shot 2014-05-26 at 2 28 55 am](https://cloud.githubusercontent.com/assets/108094/3079595/0cefcb7e-e49f-11e3-829f-554cbbdb1b3c.png)

Not ready yet. Notes inline.