fix factory girl
update gitignore
fix Gemfile for factory girl and capybara