Merge branch 'tiny_fixes' into 'master'

Tiny fixes to correctly accomodate the switch between SPH variations

Most of it is code re-factoring. I have unified some definitions of the i/o routines and debugging routines.

Solves issues #82 an #83.

See merge request !85