handling the first merge from yesterday. In preparation for the next merge today.
merged depparser.cpp
adding state.h. After this we should all be merged and caught up.