Add the ability to override the doxygen version to a text string for use on the website
Merge pull request #370 from peternewman/e1.37-2

Add the ability to override the doxygen version to a text string for use...
Fix a SPaG issue, mostly just to see if the buildmaster is behaving now. skip-travis
Merge pull request #371 from peternewman/e1.37-2

Fix a SPaG issue, mostly just to see if the buildmaster is behaving now....