Merged my own .vimrc