security update for rails 2
resolving merge conflicts and removed site keys