Merge branch 'ehofman/sound'

diff --cc src/Environment/fgclouds.cxx
Simple merge

diff --cc src/Environment/fgclouds.hxx
Simple merge

diff --cc src/Instrumentation/mk_viii.hxx
Simple merge

diff --cc src/Instrumentation/navradio.cxx
Simple merge

diff --cc src/Instrumentation/navradio.hxx
Simple merge

diff --cc src/Main/fg_init.cxx
Simple merge

diff --cc src/Main/main.cxx
Simple merge

diff --cc tests/Makefile.am
Simple merge