Reduced warnings

This branch significantly reduces the number of warnings that are spit out when using factory girl.