comment out rvm & virtualenv
png diff
lotsa new vim settings