Resolve merge issues and update .conf to reflect modop setup

rose-suite.conf

 [jinja2:suite.rc]
 ## Run properties
-INITIAL_START_DATE='2018-11-22T12:00:00Z'
+INITIAL_START_DATE='2018-11-27T12:00:00Z'
 FINAL_CYCLE_POINT='NONE'
 MAIL_TO='mbe@pml.ac.uk'
 
 # GFS settings
-EURYALE_GFS_ARCHIVE='/data/sthenno1/backup/mbe/Data/gfs_forcing/'
-CETO_GFS_DIR='/gpfs1/users/modellers/mbe/Data/wrf_gfs_rolling_archive'
+EURYALE_GFS_ARCHIVE='/data/sthenno1/scratch/modop/Data/GFS/'
+CETO_GFS_DIR='/gpfs1/users/modellers/modop/Data/GFS_rolling/'
 
 ## CMEMS settings
-CMEMS_DATA_DIR='/data/sthenno1/backup/mbe/Data/CMEMS'
+CMEMS_DATA_DIR='/data/sthenno1/scratch/modop/Data/CMEMS'

suite.rc

@@ -39,7 +39,7 @@
 			echo "starting download at "${START_DATE}
 				"""
 	[[get_CMEMS_data]]
-    [[get_GFS_data]]
+	[[get_GFS_data]]
 	[[finish_download]]
         script = """
             echo "finished download for "${START_DATE}