Restored Nick's working doxygen.conf from 151870b.
Merge pull request #346 from myshkin/doxygen_conf

Restored Nick's working doxygen.conf from 151870b.