More Cylon Specs

Adds a bunch of specs for Cylon and un-breaks some other stuff.

:bomb: