Database setup
Cleaned up .swp files