Clean up some aliases/vim stuff