Updated vimrc and zshrc including cp alias and vim scala support