use of get_data_combined function in place of seperate functions, map to old method names temporarily
use of get_data_combined function in place of seperate functions, map to old method names temporarily

emoncms/emoncms,emoncms/emoncms,emoncms/emoncms,emoncms/emoncms,emoncms/emoncms