Added input capabilities, merged one- and two-deme solvers