add better copy and paste for vim. create pbcopy alias for shell
fix merge