rtorrent.rc and vimrc changes merging into master