deleted debug and swp files
merged changes from vishrut's pull