tidied up all warnings on OSX
Changes to experiments and various small fixes
Merged with head

Signed-off-by: Alex Cope <a.cope@shef.ac.uk>