Minor cleanup. Removed .swp files. Removed some old files