for some reason i needed to require factory_girl here
removed gits from Gemfile as much as possible (more control with versions), tests pass
Fix tests
authlogic has had several deprecation warnings.
merging