added syntax gem
updated .gitignore
added new section for user tests
fixed merge error, added Authlogic test stuff