fixed to use correct #define depending on radio

#define XRF or GPRS depending on radio type
correct use of diag port for debugs and non-radio messages
merged GPRS

new (merged) GPRS module
tidy up

always initialise diag port
remove unused separatorPrint routine
tidy up

entire module inside #define
corrected use of radio and debug port
limit number of tries to set radio module sleep mode
tidy up

char arrays correctly defined
internal name of FTPsql string changed
list settings extra info commented out
correct separation of radio and debug streams
correct separation of radio and debug streams

also tidied up setup so events occur in correct order
extra call to checkCommands so it can be called more reliably
fixed call to wxftp2sql so it occurs DELAY after ftp completes
extra flush() calls for streams