Moved some junk around
Added .sw? files to .gitignore