Support Factory girl traits

The title says it all. I've added support for traits