Merge branch 'master' of https://git.wur.nl/ctdas/CTDAS into feature-STILT

Conflicts:
	stilt.nc4.sib.co2.Feb.2015.May13.r

da/test/test_optimizer.py

@@ -21,6 +21,7 @@ File created on 04 Aug 2010.
 
 """
 
+
 def serial_py_against_serial_fortran():
     """ Test the solution of the serial algorithm against the CT cy2 fortran generated one """
 

template.py → templates/template.py

@@ -27,7 +27,7 @@ sys.path.append(os.getcwd())
 
 from da.tools.initexit import start_logger, validate_opts_args, parse_options, CycleControl
 from da.tools.pipeline import ensemble_smoother_pipeline, header, footer
-from da.platform.maunaloa import MaunaloaPlatform 
+from da.platform.capegrim import CapeGrimPlatform 
 from da.baseclasses.dasystem import DaSystem 
 from da.baseclasses.statevector import StateVector 
 from da.carbondioxide.obspack_globalviewplus2 import ObsPackObservations