Added vim stuff and aliases