added stuff for pymc3
Merge branch 'master' of github.com:robdmc/setupFiles

Conflicts:
	condaSetup.sh