Separated out aliases and functions, added vim function