Add .DS_Store to the .gitignore
Update to rails HEAD.

RC2 will be out soon, might as well get ready now.