updated pandas setup and conda setup
Merge branch 'master' of github.com:robdmc/setupFiles

Conflicts:
	.vim/.netrwhist
	condaSetup.sh
merging .bashrc and condaSetup changes