Updated to reflect team switch.

Also added .swp's to gitignore