lots of new aliases and functions, + cleaning up the files a bit (and removing vim)