Various changes over the last couple months, especially vimrc