Merge branch 'master', remote-tracking branch 'origin' into HEAD
massive tidy up the configurations. We now only have three configurations that are in use:

DefaultConfiguration: Used for all tests and is the base for the other configurations
SteadyConfiguration: Used for all steady state examples
UnteadyConfiguration: Used for all time-dependent examples
Merge branch 'master', remote-tracking branch 'origin'
Merge branches 'clean_configurations' and 'master'