Added vim setup and tweaked setup