Rename contrib/dakota to contrib/pyDAKOTA
Minor setup.py tweak