Merge pull request #31 from BFALacerda/hydro-devel

expected times between nodes now used in scheduler
Merge pull request #37 from BFALacerda/hydro-devel

prism cleaning
readding lost header files