Moving to cmake; fix instructions to run Trojita