Merge branch 'master' of ssh://github.com/nwf/dyna into HEAD

diff --cc Makefile
index 7905e458027567ac5d348b4188efc434b0469572,5c8fa6ce683a7e7aad9a57000383f9e97d9af0cc..00b356c4dfce8dba62f8249399da00bc43a807b1
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -72,10 -76,11 +76,10 @@@ haddock
  # Build our sphinx documentation
  .PHONY: sphinxbuild sphinxdoc
  sphinxbuild:
-       (cd docs/sphinx; make html)
+       which sphinx-build >/dev/null && (cd docs/sphinx; make html)
  
  sphinxdoc: sphinxbuild
 -      python -c 'import webbrowser; \
 -        webbrowser.open("./docs/sphinx/_build/html/index.html")'
 +      python -m webbrowser "./docs/sphinx/_build/html/index.html"
  
  doc: sphinxbuild haddock
  

diff --cc src/Dyna/Backend/Python/utils.py
Simple merge