Fix curlrc, aliases, tmux and vimrc
Merge from remote master