corrected gitignore and added ss3.1 fix to TwitterUserAdmin
merged conflict