adding some aliases and removing vim EVERYWHERE....