Removed unused vim stuff, updated env stuff