Added a bunch of stuff, vim stuff