doxyfile update; energy documentation; intel warnings
Merge w. bjorn
Merge pull request #44 from mlund/develop

Develop