fixed ifndef in .h files
router Popen.wait()
getStDists tweak
Merge branch 'master' into iss_plot to reflect upstream changes