Updating dawson branch
Removed .swp files.
Merged