Re-organize aliases, vimrc, and add some shortcuts