Added factorygirl, faker data, style changes