Added prettyprint.hpp
Fixed prettyprint includes