Merged the modbus master and the xively code; removed the xively test code