Make --version work identical in dlhmm and plasma
Add git branch to --version
Merge branch 'master' into fire